Drawio - Add resolution of external image to get self contained SVG #1771
Conversation
jynolen
changed the title
diagrams.net/src/worker.js
Outdated
| await writeFile("before.svg", svgRoot) | ||
| await writeFile("after.svg", $("svg").toString()) |
There was a problem hiding this comment.
I guess this was for testing purpose?
diagrams.net/src/worker.js
Outdated
| @@ -27,6 +29,32 @@ export class Worker { | |||
| this.convertTimeout = process.env.KROKI_DIAGRAMSNET_CONVERT_TIMEOUT || '15000' | |||
| } | |||
|
|
|||
| async resolveImage(svgRoot) { | |||
| let $ = cheerio.load(svgRoot, { | |||
There was a problem hiding this comment.
Since we are using Puppeteer we could potentially parse/edit the SVG in page.evaluate? That would remove the dependency on cheerio.
There was a problem hiding this comment.
Definitely I am not a JS expert I will check to change it
There was a problem hiding this comment.
Did you find a way to implement this feature without relying on cheerio? I can take a look if you want?
|
Someone mentioned in the community chat that diagrams.net has an "embed" feature: https://www.drawio.com/doc/faq/embed-mode It might be possible to rely on the query parameter |
|
@jynolen could you please share an example with external images? I want to test if |
|
Here you are 👍 https://gist.github.com/jynolen/05f48d96f09cfdffd9bcf6b99b91256f |
|
It's not as easy as I thought since it relies on a proxy: #1796 As this adds an attack vector, I think it would be preferable to enable this feature when Kroki safe mode is set to |
|
I update the code to discard unsage of cheerio. I put 2 environment variables "KROKI_SAFE_MODE" to allow / disallow fetching images, and "KROKI_DIAGRAMNET_PORT" to customise listening port I take the liberty to rewrite a bit the evaluation function to make it a bit easier to read and maintain. @ggrossetie If you can have a look |
jynolen
force-pushed
the
feat/resolveImage
branch
3 times, most recently
from
88014da
to
0acbc99
Compare
jynolen
force-pushed
the
feat/resolveImage
branch
from
0acbc99
to
93243ec
Compare
This PR help to keep drawio svg self contained.
Background
I use SelfHosted Kroki with antora doc generator
When using drawio diagrams it happned that some part of the diagr was missing because it relies on external images.
What have been done:
With this PR, during the rendering phase, kroki will retreive external image to embed them as base64 src.
This way diagrram will be rendered correctly whenever and wherever